RDK-61440: Implementation of handling PowerMode Change in NM plugin by Anand73-n · Pull Request #308 · rdkcentral/networkmanager

Anand73-n · 2026-05-11T06:58:42Z

Do not merge.

Copilot

Pull request overview

This PR introduces PowerManager integration to handle DeepSleep-related power mode transitions in the NetworkManager plugin, while also improving thread-safety around default-interface handling and making several robustness fixes (iterator null checks, GLib/libnm context isolation, and deinit hooks). It also bumps the plugin/interface version to 2.2.0 and updates documentation/changelog accordingly.

Changes:

Add a new NetworkManagerPowerClient (COMRPC client) and hook it into NetworkManagerImplementation to act on DeepSleep pre-change/changed events.
Make default-interface access thread-safe (getDefaultInterface/setDefaultInterface) and update call sites across proxies/connectivity monitor.
Improve crash resilience/robustness (null checks on iterator creation, platform deinit functions, GNOME wifi operation serialization, minimal ethernet profile support) and update versioning/docs.

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
tests/l2Test/libnm/l2_test_libnmproxy.cpp	Minor unit test expectation cleanup / formatting fix.
plugin/rdk/NetworkManagerRDKProxy.cpp	Use thread-safe default-interface getters/setters; add iterator null checks; add `platform_deinit()`.
plugin/NetworkManagerPowerClient.h	New PowerManager client interface + callback contract for DeepSleep handling.
plugin/NetworkManagerPowerClient.cpp	New COMRPC client implementation with an internal worker thread and pre-change ack handling.
plugin/NetworkManagerJsonRpc.cpp	Add null checks for iterator creation before invoking implementation APIs.
plugin/NetworkManagerImplementation.h	Introduce thread-safe default-interface accessors, PowerManager callback integration, and platform deinit declaration.
plugin/NetworkManagerImplementation.cpp	Instantiate PowerManager client; call platform deinit in destructor; use thread-safe default-interface; implement power callbacks.
plugin/NetworkManagerConnectivity.cpp	Use thread-safe default-interface access in connectivity monitoring logic.
plugin/gnome/NetworkManagerGnomeWIFI.h	Add ethernet-minimal-profile helper; add mutex to serialize wifi operations.
plugin/gnome/NetworkManagerGnomeWIFI.cpp	Context push/pop moved to per-operation; serialize operations; add minimal ethernet profile; improve cleanup/error handling.
plugin/gnome/NetworkManagerGnomeProxy.cpp	Replace global NMClient with per-instance client/context; add deinit; add migration cleanup + minimal ethernet profile on eth enable.
plugin/gnome/gdbus/NetworkManagerGdbusProxy.cpp	Use thread-safe default-interface and add `platform_deinit()`.
plugin/CMakeLists.txt	Add `ENABLE_POWERMANAGER` option, build/link new power client when enabled.
legacy/LegacyWiFiManagerAPIs.cpp	Add null check after iterator creation.
legacy/LegacyNetworkAPIs.cpp	Add null check after iterator creation.
docs/NetworkManagerPlugin.md	Bump documented version to 2.2.0.
definition/NetworkManager.json	Bump interface version to 2.2.0.
CMakeLists.txt	Bump project version minor to 2 (2.2.0).
CHANGELOG.md	Add entries for 2.2.0 and 2.1.0.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+                                    if(getDefaultInterface() != iface.name)
+                                        ReportActiveInterfaceChange(getDefaultInterface(), iface.name);


+option(ENABLE_POWERMANAGER "Enable PowerManager COMRPC integration for DeepSleep WiFi management" ON)
+if(ENABLE_POWERMANAGER)
+    find_package(${NAMESPACE}Definitions REQUIRED)
+    add_definitions(-DENABLE_POWERMANAGER)
+    message("NetworkManager: PowerManager integration enabled")
+endif()


+                        // If there are multiple messages backed up, process a bounded number
+                        // of pending iterations so this path cannot stall indefinitely if the
+                        // context keeps receiving new work.
+                        while (g_main_context_iteration(device_context, FALSE));


Reason for change: Ctrl ntwrk state based on PowerMode transitions Test procedure: Change the PowerMode state and verify the behavior Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Reason for change: Add log to know cliendId Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Reason for change: fix crash from power worker thread Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Reason for change: offload prechange WiFi disc to dedicated powerthrd Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Reason for change: enabled ConnectToKnownSSID() Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Reason for change: trigger normal WiFi scan on DeepSleep wakeup with Network Standby ON to handle AP channel changes Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Reason for change: check before initiating wifi connect and disconnect Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

+                if (m_wlanEnabled.load() && !m_lastConnectedSSID.empty()) {
+                    NMLOG_INFO("OnPowerModePreChange: waking from DeepSleep — reconnecting to '%s'",
+                               m_lastConnectedSSID.c_str());
+                      ConnectToKnownSSID(m_lastConnectedSSID); // fire-and-forget


Reason for change: Disconnect ethernet on DeepSleep entry and reconnect on wakeup OnPowerModePreChange Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Reason for change: guard ethernet wakeup reconnect with m_ethDisconnectedForSleep Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 6 comments.

Comments suppressed due to low confidence (1)

plugin/NetworkManagerPowerClient.cpp:115

Operational(false) stops and joins the power-event thread before unregistering from PowerManager. There is a race window where the COM-RPC dispatcher can still deliver an OnPowerModePreChange after the thread has exited, causing the notification handler to enqueue a PRE_CHANGE event that will never be processed/acked, potentially stalling the power-mode transition. Consider unregistering (or otherwise preventing further notifications / sending an immediate ack) before joining the thread, or making the notification path fast-ack when mStopThread is set.

    } else {
        // Stop the power-event thread before unregistering so any in-flight
        // event that was already enqueued is drained with a fast ack.
        mStopThread = true;
        mQueueCv.notify_one();
        if (mPowerThread.joinable()) {
            mPowerThread.join();
        }
        unregisterEventsAndDeactivate();
    }

+                if (m_ethEnabled.load() && m_ethConnected.load()) {
+                    NMLOG_INFO("OnPowerModePreChange: going to DeepSleep — disconnecting Ethernet");
+                    uint32_t rcEthDown = EthernetDisconnect();
+                    if (rcEthDown == Core::ERROR_NONE) {
+                        m_ethDisconnectedForSleep.store(true);


+option(ENABLE_POWERMANAGER "Enable PowerManager COMRPC integration for DeepSleep WiFi management" ON)
+if(ENABLE_POWERMANAGER)
+    find_package(${NAMESPACE}Definitions REQUIRED)
+    add_definitions(-DENABLE_POWERMANAGER)
+    message("NetworkManager: PowerManager integration enabled")
+endif()


Reason for change: guard wifi wakeup reconnect with m_wlanDisconnectedForSleep Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Reason for change: Additional logging and code alignment Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Reason for change: Fix for trigger Wi-Fi scan OnPowerMode Changed Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Anand73-n requested a review from a team as a code owner May 11, 2026 06:58

Copilot AI review requested due to automatic review settings May 11, 2026 06:58

Copilot started reviewing on behalf of Anand73-n May 11, 2026 06:59 View session

Copilot AI reviewed May 11, 2026

View reviewed changes

anandn654 added 6 commits May 11, 2026 12:41

RDK-61440: Implementation of handling PowerMode Change in NM plugin

577304a

Reason for change: Ctrl ntwrk state based on PowerMode transitions Test procedure: Change the PowerMode state and verify the behavior Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

RDK-61440: Implementation of handling PowerMode Change in NM plugin

dcac682

Reason for change: Add log to know cliendId Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

RDK-61440: Implementation of handling PowerMode Change in NM plugin

5750f47

Reason for change: fix crash from power worker thread Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

RDK-61440: Implementation of handling PowerMode Change in NM plugin

d0af89b

Reason for change: offload prechange WiFi disc to dedicated powerthrd Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

RDK-61440: Implementation of handling PowerMode Change in NM plugin

ea391ad

Reason for change: enabled ConnectToKnownSSID() Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Anand73-n force-pushed the topic/RDK-61440 branch from 0963fb3 to afbdab5 Compare May 11, 2026 12:43

RDK-61440: Implementation of handling PowerMode Change in NM plugin

7bfe781

Reason for change: check before initiating wifi connect and disconnect Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Copilot AI review requested due to automatic review settings May 11, 2026 16:33

Copilot started reviewing on behalf of Anand73-n May 11, 2026 16:34 View session

Copilot AI reviewed May 11, 2026

View reviewed changes

anandn654 added 2 commits May 13, 2026 01:42

RDK-61440: Implementation of handling PowerMode Change in NM plugin

93339e6

Reason for change: guard ethernet wakeup reconnect with m_ethDisconnectedForSleep Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Copilot AI review requested due to automatic review settings May 13, 2026 07:02

Copilot started reviewing on behalf of Anand73-n May 13, 2026 07:02 View session

Copilot AI reviewed May 13, 2026

View reviewed changes

anandn654 added 2 commits May 13, 2026 17:00

RDK-61440: Implementation of handling PowerMode Change in NM plugin

3f460f2

Reason for change: guard wifi wakeup reconnect with m_wlanDisconnectedForSleep Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

RDK-61440: Implementation of handling PowerMode Change in NM plugin

4018eaa

Reason for change: Additional logging and code alignment Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Copilot AI review requested due to automatic review settings May 14, 2026 05:16

Copilot started reviewing on behalf of Anand73-n May 14, 2026 05:17 View session

Copilot AI reviewed May 14, 2026

View reviewed changes

Comment thread plugin/gnome/NetworkManagerGnomeWIFI.cpp

Comment thread plugin/NetworkManagerImplementation.cpp

RDK-61440: Implementation of handling PowerMode Change in NM plugin

3d75f10

Reason for change: Fix for trigger Wi-Fi scan OnPowerMode Changed Test procedure: Change the PowerMode and verify the log Risks: low Priority: P1 Signed-off-by: Anand N <Anand_N@comcast.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RDK-61440: Implementation of handling PowerMode Change in NM plugin #308

RDK-61440: Implementation of handling PowerMode Change in NM plugin #308
Anand73-n wants to merge 12 commits into
developfrom
topic/RDK-61440

Anand73-n commented May 11, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		if(getDefaultInterface() != iface.name)
		ReportActiveInterfaceChange(getDefaultInterface(), iface.name);

Conversation

Anand73-n commented May 11, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants